From: OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>
Date: Mon, 14 Sep 2020 14:43:40 +0000 (-0400)
Subject: Merge pull request #2195 from ostreedev/avoid-shadows
X-Git-Tag: archive/raspbian/2022.1-3+rpi1~1^2~4^2~7^2~16
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ca2f3435bea2f4fb1d2ad86b7508dcdb4fc7b4ac;p=ostree.git

Merge pull request #2195 from ostreedev/avoid-shadows

Avoid shadowing local variables
---

ca2f3435bea2f4fb1d2ad86b7508dcdb4fc7b4ac